'; @@ -120,7 +119,7 @@ . (!empty($this->trip) ? ' '.$this->trip.'':''); // IP Address - if($mod && $mod['type'] >= MOD_SHOW_IP) { + if($this->mod && $this->mod['type'] >= MOD_SHOW_IP) { $built .= ' [' . $this->ip . ']'; } @@ -140,7 +139,7 @@ '
'; // File info - if(!empty($this->file)) { + if(!empty($this->file) && $this->file != 'deleted') { $built .= 'File: ' . $this->file . ' (' .
// Filesize
format_bytes($this->filesize) . ', ' .
@@ -156,6 +155,8 @@
// Thumbnail
' File: ' . $this->file . ' (' .
// Filesize
@@ -262,7 +262,7 @@
. (!empty($this->trip) ? ' '.$this->trip.'':'');
// IP Address
- if($mod && $mod['type'] >= MOD_SHOW_IP) {
+ if($this->mod && $this->mod['type'] >= MOD_SHOW_IP) {
$built .= ' [' . $this->ip . ']';
}
diff --git a/inc/functions.php b/inc/functions.php
index 2ba34827..36ee9807 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -131,7 +131,7 @@
if($query->rowcount() < 1 && $page > 1) return false;
while($th = $query->fetch()) {
- $thread = new Thread($th['id'], $th['subject'], $th['email'], $th['name'], $th['trip'], $th['body'], $th['time'], $th['thumb'], $th['thumbwidth'], $th['thumbheight'], $th['file'], $th['filewidth'], $th['fileheight'], $th['filesize'], $th['filename'], $th['ip'], $th['sticky'], $mod ? '?/' : ROOT);
+ $thread = new Thread($th['id'], $th['subject'], $th['email'], $th['name'], $th['trip'], $th['body'], $th['time'], $th['thumb'], $th['thumbwidth'], $th['thumbheight'], $th['file'], $th['filewidth'], $th['fileheight'], $th['filesize'], $th['filename'], $th['ip'], $th['sticky'], $mod ? '?/' : ROOT, $mod);
$posts = prepare(sprintf("SELECT `id`, `subject`, `email`, `name`, `trip`, `body`, `time`, `thumb`, `thumbwidth`, `thumbheight`, `file`, `filewidth`, `fileheight`, `filesize`, `filename`,`ip` FROM `posts_%s` WHERE `thread` = ? ORDER BY `time` DESC LIMIT ?", $board['uri']));
$posts->bindValue(1, $th['id']);
@@ -151,7 +151,7 @@
}
while($po = $posts->fetch()) {
- $thread->add(new Post($po['id'], $th['id'], $po['subject'], $po['email'], $po['name'], $po['trip'], $po['body'], $po['time'], $po['thumb'], $po['thumbwidth'], $po['thumbheight'], $po['file'], $po['filewidth'], $po['fileheight'], $po['filesize'], $po['filename'], $po['ip'], $mod ? '?/' : ROOT));
+ $thread->add(new Post($po['id'], $th['id'], $po['subject'], $po['email'], $po['name'], $po['trip'], $po['body'], $po['time'], $po['thumb'], $po['thumbwidth'], $po['thumbheight'], $po['file'], $po['filewidth'], $po['fileheight'], $po['filesize'], $po['filename'], $po['ip'], $mod ? '?/' : ROOT, $mod));
}
$thread->posts = array_reverse($thread->posts);
@@ -319,9 +319,9 @@
while($post = $query->fetch()) {
if(!isset($thread)) {
- $thread = new Thread($post['id'], $post['subject'], $post['email'], $post['name'], $post['trip'], $post['body'], $post['time'], $post['thumb'], $post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'], $post['fileheight'], $post['filesize'], $post['filename'], $post['ip'], $post['sticky'], $mod ? '?/' : ROOT);
+ $thread = new Thread($post['id'], $post['subject'], $post['email'], $post['name'], $post['trip'], $post['body'], $post['time'], $post['thumb'], $post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'], $post['fileheight'], $post['filesize'], $post['filename'], $post['ip'], $post['sticky'], $mod ? '?/' : ROOT, $mod);
} else {
- $thread->add(new Post($post['id'], $thread->id, $post['subject'], $post['email'], $post['name'], $post['trip'], $post['body'], $post['time'], $post['thumb'], $post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'], $post['fileheight'], $post['filesize'], $post['filename'], $post['ip'], $mod ? '?/' : ROOT));
+ $thread->add(new Post($post['id'], $thread->id, $post['subject'], $post['email'], $post['name'], $post['trip'], $post['body'], $post['time'], $post['thumb'], $post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'], $post['fileheight'], $post['filesize'], $post['filename'], $post['ip'], $mod ? '?/' : ROOT, $mod));
}
}
diff --git a/inc/mod.php b/inc/mod.php
index a2ee93ce..c73b72f0 100644
--- a/inc/mod.php
+++ b/inc/mod.php
@@ -159,7 +159,12 @@
// Delete file
@unlink($board['dir'] . DIR_IMG . $post['file']);
+ // Update database
+ $query = prepare(sprintf("UPDATE `posts_%s` SET `thumb` = NULL, `thumbwidth` = NULL, `thumbheight` = NULL, `filewidth` = NULL, `fileheight` = NULL, `filesize` = NULL, `filename` = NULL, `filehash` = NULL, `file` = 'deleted' WHERE `id` = :id OR `thread` = :id", $board['uri']));
+ $query->bindValue(':id', $id, PDO::PARAM_INT);
+ $query->execute() or error(db_error($query));
+ buildThread($post['thread']);
}
// Delete a post (reply or thread)
diff --git a/mod.php b/mod.php
index 6bce948f..be9268a0 100644
--- a/mod.php
+++ b/mod.php
@@ -219,7 +219,7 @@
if(!openBoard($boardName))
error(ERROR_NOBOARD);
- if(!$page = index(empty($matches[2]) || $matches[2] == FILE_INDEX ? 1 : $matches[2], true)) {
+ if(!$page = index(empty($matches[2]) || $matches[2] == FILE_INDEX ? 1 : $matches[2], $mod)) {
error(ERROR_404);
}
$page['pages'] = getPages(true);
@@ -235,9 +235,31 @@
if(!openBoard($boardName))
error(ERROR_NOBOARD);
- $page = buildThread($thread, true, true);
+ $page = buildThread($thread, true, $mod);
echo $page;
+ } elseif(preg_match('/^\/' . $regex['board'] . 'deletefile\/(\d+)$/', $query, $matches)) {
+ if($mod['type'] < MOD_DELETEFILE) error(ERROR_NOACCESS);
+ // Delete file from post
+
+ $boardName = $matches[1];
+ $post = $matches[2];
+ // Open board
+ if(!openBoard($boardName))
+ error(ERROR_NOBOARD);
+
+ // Delete post
+ deleteFile($post);
+ // Rebuild board
+ buildIndex();
+
+
+ // Redirect
+ if(isset($_SERVER['HTTP_REFERER']))
+ header('Location: ' . $_SERVER['HTTP_REFERER'], true, REDIRECT_HTTP);
+ else
+ header('Location: ?/' . sprintf(BOARD_PATH, $boardName) . FILE_INDEX, true, REDIRECT_HTTP);
+
} elseif(preg_match('/^\/' . $regex['board'] . 'delete\/(\d+)$/', $query, $matches)) {
if($mod['type'] < MOD_DELETE) error(ERROR_NOACCESS);
// Delete post
';
+ } elseif($this->file == 'deleted') {
+ $built .= '
';
}
$built .= $this->postControls();
@@ -169,7 +170,7 @@
class Thread {
public $omitted = 0;
- public function __construct($id, $subject, $email, $name, $trip, $body, $time, $thumb, $thumbx, $thumby, $file, $filex, $filey, $filesize, $filename, $ip, $sticky, $root=ROOT) {
+ public function __construct($id, $subject, $email, $name, $trip, $body, $time, $thumb, $thumbx, $thumby, $file, $filex, $filey, $filesize, $filename, $ip, $sticky, $root=ROOT, $mod=false) {
$this->id = $id;
$this->subject = utf8tohtml($subject);
$this->email = $email;
@@ -190,36 +191,35 @@
$this->ip = $ip;
$this->sticky = $sticky;
$this->root = $root;
+ $this->mod = $mod;
}
public function add(Post $post) {
$this->posts[] = $post;
}
- public function postControls() {
- global $mod;
-
+ public function postControls() {
$built = '';
- if($mod) {
+ if($this->mod) {
// Mod controls (on posts)
$built .= '';
// Delete
- if($mod['type'] >= MOD_DELETE)
+ if($this->mod['type'] >= MOD_DELETE)
$built .= ' ' . MOD_LINK_DELETE . '';
// Delete all posts by IP
- if($mod['type'] >= MOD_DELETEBYIP)
+ if($this->mod['type'] >= MOD_DELETEBYIP)
$built .= ' ' . MOD_LINK_DELETEBYIP . '';
// Ban
- if($mod['type'] >= MOD_BAN)
+ if($this->mod['type'] >= MOD_BAN)
$built .= ' ' . MOD_LINK_BAN . '';
// Ban & Delete
- if($mod['type'] >= MOD_BANDELETE)
+ if($this->mod['type'] >= MOD_BANDELETE)
$built .= ' ' . MOD_LINK_BANDELETE . '';
// Delete file (keep post)
- if($mod['type'] >= MOD_STICKY)
+ if($this->mod['type'] >= MOD_STICKY)
if($this->sticky)
$built .= ' ' . MOD_LINK_DESTICKY . '';
else
@@ -231,7 +231,7 @@
}
public function build($index=false) {
- global $board, $mod;
+ global $board;
$built = '